Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate link-args-order, ls-metadata and lto-readonly-lib run-make tests to rmake #126095

Merged
merged 4 commits into from
Jun 20, 2024
Merged

Migrate link-args-order, ls-metadata and lto-readonly-lib run-make tests to rmake #126095

merged 4 commits into from
Jun 20, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jun 6, 2024 •
edited by jieyouxu
Loading

Part of #121876 and the associated Google Summer of Code project.

Guaranteed to fail CI until #125736 gets merged. Will require addition of fs_wrapper::set_permissions in the associated module.

try-job: x86_64-msvc

@rustbot
Copy link
Collaborator

rustbot commented Jun 6, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Jun 6, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 6, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Jun 6, 2024

@rustbot blocked (on #125736)

@rustbot rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 6, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical Oneirical force-pushed the final-testination branch from 486a640 to bee2eea Compare June 8, 2024 20:06
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jun 8, 2024

☔ The latest upstream changes (presumably #126121) made this pull request unmergeable. Please resolve the merge conflicts.

@Kobzol Kobzol mentioned this pull request Jun 9, 2024
Open
@Kobzol Kobzol added the A-run-make Area: port run-make Makefiles to rmake.rs label Jun 9, 2024
@Oneirical Oneirical force-pushed the final-testination branch 2 times, most recently from e1f381b to 7d0e38b Compare June 9, 2024 18:17
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical Oneirical force-pushed the final-testination branch from 7d0e38b to 2591a8e Compare June 9, 2024 18:27
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical Oneirical force-pushed the final-testination branch from 2591a8e to b6c348f Compare June 9, 2024 19:44
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical Oneirical force-pushed the final-testination branch from aec402b to 75f8428 Compare June 10, 2024 14:27
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical Oneirical force-pushed the final-testination branch from 75f8428 to f4387c5 Compare June 10, 2024 15:18
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical
Copy link
Contributor Author

Oneirical commented Jun 10, 2024 •
edited
Loading

Making a note for myself:

Test stderr: The stderr "error: linking with ld failed: exit status: 1 [...] "-z" "now" "a" "\"b" "c\"" "\"d" "e\"" "f"

Test fail message: " did not contain the string ""a" "b" "c" "d" "e" "f""

Strange error... the stderr being printed out in the test failure log is the correct one, but the one being checked by assert_stderr_contains is nothing but a single double-quote.

@bors
Copy link
Contributor

bors commented Jun 11, 2024

☔ The latest upstream changes (presumably #126262) made this pull request unmergeable. Please resolve the merge conflicts.

@Oneirical Oneirical force-pushed the final-testination branch from f4387c5 to 0c0edce Compare June 11, 2024 14:06
@Oneirical
Copy link
Contributor Author

I added lld-link if Windows is detected, giving it another @bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
@bors
Auto merge of rust-lang#126095 - Oneirical:final-testination, r=<try>
e0c1673 
Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Guaranteed to fail CI until rust-lang#125736 gets merged. Will require addition of `fs_wrapper::set_permissions` in the associated module.

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jun 19, 2024

⌛ Trying commit c243f12 with merge e0c1673...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jun 19, 2024

💔 Test failed - checks-actions

@Oneirical Oneirical force-pushed the final-testination branch from c243f12 to b3c5132 Compare June 19, 2024 15:50
@Oneirical
Copy link
Contributor Author

Oneirical commented Jun 19, 2024 •
edited
Loading

I restored the ignore-msvc as it's still running into issues with the llvm linker. Let me know if you think I should try with another different linker.

@Oneirical
Copy link
Contributor Author

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 19, 2024
jieyouxu
jieyouxu approved these changes Jun 19, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@jieyouxu
Copy link
Member

I think it's fine to keep it ld only for now.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 19, 2024

📌 Commit b3c5132 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 19, 2024
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
@jieyouxu
Rollup merge of rust-lang#126095 - Oneirical:final-testination, r=jie…
be289d0 
…youxu

Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Guaranteed to fail CI until rust-lang#125736 gets merged. Will require addition of `fs_wrapper::set_permissions` in the associated module.

try-job: x86_64-msvc
@jieyouxu jieyouxu mentioned this pull request Jun 19, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
@bors
Auto merge of rust-lang#126710 - jieyouxu:rollup-3hmke71, r=jieyouxu
f2b449c 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#124807 (Migrate `run-make/rustdoc-io-error` to `rmake.rs`)
 - rust-lang#126095 (Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`)
 - rust-lang#126308 (Ban `ArrayToPointer` and `MutToConstPointer` from runtime MIR)
 - rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
 - rust-lang#126629 (Migrate `run-make/compressed-debuginfo` to `rmake.rs`)
 - rust-lang#126644 (Rewrite `extern-flag-rename-transitive`. `debugger-visualizer-dep-info`, `metadata-flag-frobs-symbols`, `extern-overrides-distribution` and `forced-unwind-terminate-pof` `run-make` tests to rmake)
 - rust-lang#126650 (Rename a bunch of things in the new solver and `rustc_type_ir`)

r? `@ghost`
`@rustbot` modify labels: rollup
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
@jieyouxu
Rollup merge of rust-lang#126095 - Oneirical:final-testination, r=jie…
ee9bbe0 
…youxu

Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Guaranteed to fail CI until rust-lang#125736 gets merged. Will require addition of `fs_wrapper::set_permissions` in the associated module.

try-job: x86_64-msvc
@jieyouxu jieyouxu mentioned this pull request Jun 19, 2024
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
@jieyouxu
Rollup merge of rust-lang#126095 - Oneirical:final-testination, r=jie…
562a495 
…youxu

Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Guaranteed to fail CI until rust-lang#125736 gets merged. Will require addition of `fs_wrapper::set_permissions` in the associated module.

try-job: x86_64-msvc
@jieyouxu jieyouxu mentioned this pull request Jun 19, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
@bors
Auto merge of rust-lang#126716 - jieyouxu:rollup-yjml58m, r=jieyouxu
400a1b1 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#126095 (Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`)
 - rust-lang#126534 (Migrate `run-make/comment-section` to `rmake.rs`)
 - rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
 - rust-lang#126629 (Migrate `run-make/compressed-debuginfo` to `rmake.rs`)
 - rust-lang#126644 (Rewrite `extern-flag-rename-transitive`. `debugger-visualizer-dep-info`, `metadata-flag-frobs-symbols`, `extern-overrides-distribution` and `forced-unwind-terminate-pof` `run-make` tests to rmake)
 - rust-lang#126650 (Rename a bunch of things in the new solver and `rustc_type_ir`)
 - rust-lang#126698 (Migrate `unknown-mod-stdin`, `issue-68794-textrel-on-minimal-lib`, `raw-dylib-cross-compilation` and `used-cdylib-macos` `run-make` tests to rmake)
 - rust-lang#126703 (reword the hint::blackbox non-guarantees)
 - rust-lang#126708 (Minimize `can_begin_literal_maybe_minus` usage)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 20, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
@bors
Auto merge of rust-lang#126745 - matthiaskrgr:rollup-xagplef, r=matth…
4333551 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#126095 (Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`)
 - rust-lang#126629 (Migrate `run-make/compressed-debuginfo` to `rmake.rs`)
 - rust-lang#126644 (Rewrite `extern-flag-rename-transitive`. `debugger-visualizer-dep-info`, `metadata-flag-frobs-symbols`, `extern-overrides-distribution` and `forced-unwind-terminate-pof` `run-make` tests to rmake)
 - rust-lang#126735 (collect attrs in const block expr)
 - rust-lang#126737 (Remove `feature(const_closures)` from libcore)
 - rust-lang#126740 (add `needs-unwind` to UI test)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4405047 into rust-lang:master Jun 20, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 20, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
@rust-timer
Unrolled build for rust-lang#126095
ef8317c 
Rollup merge of rust-lang#126095 - Oneirical:final-testination, r=jieyouxu

Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Guaranteed to fail CI until rust-lang#125736 gets merged. Will require addition of `fs_wrapper::set_permissions` in the associated module.

try-job: x86_64-msvc
@Oneirical Oneirical deleted the final-testination branch June 21, 2024 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
Oxidizing run-make tests
Status: Done
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Oneirical @rustbot @jieyouxu @rust-log-analyzer @bors @Kobzol